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

Change-Id: I7db54fb12160d30e4bdff103486c64d28b7751e7