Merge cherrypicks of [13746220, 13745437] into rvc-qpr2-release

Change-Id: I1daaa8cd440c853927dcbd5de7b98cf090a83cb0