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

Change-Id: I1dcecd8058554b07b8f37a5aa27e960e319bf064