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