Merge cherrypicks of [12721685, 12721367, 12721368, 12721369, 12721348, 12721705, 12721725, 12721726, 12721745] into rvc-release

Change-Id: I71a76c24034c1ab49fb17d3b97763974c6964ade