Merge cherrypicks of [12841496, 12841515, 12841186, 12841100, 12841499, 12841500, 12841101, 12841504] into rvc-qpr1-release

Change-Id: I6c1b4c35f34a930ba04c14aa9b10d8aadebe60e4