Merge cherrypicks of [13147262, 13146733, 13146734, 13146735, 13147456] into rvc-qpr1-c-release Change-Id: I9a3e33e08660869f710da8b1d19c3442ff96f4a2