Merge cherrypicks of [12212499, 12213565, 12213741, 12213742, 12213743, 12213702, 12213319, 12213491, 12213118, 12213065, 12213602, 12213603] into rvc-release

Change-Id: I64fc3baa2e76b9f22537a753eb52dff8e2c9fa34