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

Change-Id: I2350e693595f16c7756bf2c38a5b36665d9b6410