Merge "Remove the unused variable." into rvc-dev am: d8cf9a98ed am: 1cab4e7c61

Change-Id: I3a3b9089e9e4bc0c8a4cda4b9b3764cc4d20ed11