Merge cherrypicks of [12742081, 12740729, 12741823, 12741149, 12740897, 12740898, 12741537, 12742616, 12742617, 12742618, 12741671, 12738804, 12740899, 12740900, 12740901, 12740797, 12740798, 12742180, 12742181, 12740730, 12741672, 12741673, 12742182, 12742183] into rvc-d1-release

Change-Id: Ia16b6f8794af057a8b4167d4c3288aefb04627ee