Merge "Merge "Remove the unused variable." into rvc-dev am: d8cf9a98ed" into rvc-d1-dev am: 7313e2c295

Change-Id: I79fcd2dd0e09fdda03cbfc33621f95e84375c689