Merge cherrypicks of [12725903, 12726350, 12727101, 12727200, 12727201] into rvc-d1-b-release Change-Id: I2a32dbeed74ccce17dc44024525facc331fa6539