Merge cherrypicks of [12039634, 12039691, 12039912, 12040161, 12040181, 12039913, 12036010] into rvc-release

Change-Id: Ic2ce932d79cdbddf5c33625c48da6d6effedbb2a