Merge branch 'rvc-qpr1-release' into rvc-platform-merge

Change-Id: I5694cf3fdee5572e023b1b7c19326e8e23d2efba