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

Change-Id: I124b84fcbd3ac505d1e90b91b290e41fe9347079