Merge branch 'dev/11/fp3/security-aosp-rvc-release' into int/11/fp3

* dev/11/fp3/security-aosp-rvc-release:
  Avoid read out of bounds

Change-Id: I0f222572f376beee7dbcba8c4c3b218b80f9ebde