Merge cherrypicks of [12724202, 12724210, 12721230, 12724629] into rvc-d1-b-release

Change-Id: Ia7cd5d7d5d57758c2c2b27948ba40ddae07b6618