Merge cherrypicks of [12991948, 12991950, 12991951] into rvc-qpr1-release

Change-Id: Ie6cd7d01a8f552487aeee9c35655caffb9bf8e1c