Merge "Remove the unused variable." into rvc-dev