Merge cherrypicks of [12204290, 12204195, 12205772, 12205773, 12205663] into rvc-release

Change-Id: I96f4acd2bc4ae6cccf9bdb93f9c84d34b24603da