Merge "Merge "Remove the unused variable." into rvc-dev am: d8cf9a98ed" into rvc-d1-dev am: 7313e2c295 am: f5fcceba8c
Change-Id: I6525d3fc82589f4879c486e9ee7b815fda330853
This commit is contained in: