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

Change-Id: Ieecfb4e857f7f25cb92847f869b848a1092bd645