Merge changes from topic "am-241d098fd3a3470089b8685ef58faebf" into rvc-qpr-dev-plus-aosp

* changes:
  Merge "DO NOT MERGE: Fix array casting bug" into rvc-dev am: e632c246fa am: 4064cfb411 am: 026d43a344
  DO NOT MERGE: Fix array casting bug am: e007303822 am: 4be3f755e4 am: f8111a5c2a