Merge cherrypicks of [12408287, 12406146, 12408322, 12407621, 12407777, 12407778, 12407779, 12408288, 12408119, 12408120, 12408121, 12408342, 12408343, 12408344, 12408345, 12408346, 12408347, 12408348, 12407673, 12406215, 12408349, 12406235, 12406236, 12406237, 12406238, 12406239, 12406240, 12406241, 12408362] into rvc-d1-release

Change-Id: I5ae35049d6a31629ef387c79c9456fc0678d9ce3