Merge cherrypicks of [12742135, 12742136, 12742137] into rvc-d1-release

Change-Id: If9350beabd5827ae46cb7688d0e5e1055ef14506