Merge cherrypicks of [13636770, 13638692, 13636771, 13637567] into rvc-qpr2-release

Change-Id: I95f2080ce34457beadff9fe8f5297a7ba87a645c