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

Change-Id: Ic38f1b419450a5f6358ba437b20090c1b19f24ee