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

Change-Id: Ia186b86f3664e5e15e26f76b0e68f2e8b3280ffd