Merge cherrypicks of [12429009, 12429129, 12428888, 12429130] into rvc-d1-release

Change-Id: I42955e2e13cfaa5f6b6b7a70f9a04df6dddf46e1