Merge cherrypicks of [9617721, 9617650, 9616775, 9616776, 9617925, 9617944] into rvc-release

Change-Id: Ie98f53385621cffaa70748618728a80c644ba8a4