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

Change-Id: I5c07b46f052d8edc9ce7855a705daf04f8f6fb02