Merge cherrypicks of [12842985] into rvc-qpr1-release

Change-Id: I108a0ff93118e8545cbab37e2a8dd13ed460ca82