Snap for 6886900 from d0d0a2bf904a1ce56245a91196797b2021083dad to rvc-qpr2-release

Change-Id: I1366d1f7bd942935b74462905d745ec8a1b33f9e