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

Change-Id: I10c4637c372d4af319f3ebd2c79ac48b443b93b6