Merge cherrypicks of [9734022, 9734337, 9733748, 9733749, 9734338, 9734339, 9734401, 9734402, 9734403, 9734404, 9734405, 9734023, 9734456, 9734340, 9733750, 9733999, 9733853, 9734000, 9734117, 9734341, 9734342, 9734049, 9734343, 9734458, 9734001] into rvc-release

Change-Id: I3979a6a9541450023a0dbd4130cc89ecae7501a5