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

Change-Id: Ie666f4dc8b863675abc513755f047c5cd7394c6d