Merge cherrypicks of [12718018, 12715920, 12715921, 12717933, 12718060, 12718061, 12717721, 12717383, 12717722] into rvc-d1-b-release

Change-Id: I1500ed7bc7b8072c701bcb9be8909a37e64de84e