Merge changes from topic "am-ab7bc1e5c00341dd99229d3890609eca" into rvc-d1-dev-plus-aosp

* changes:
  Merge "DO NOT MERGE: Fix array casting bug" into rvc-dev am: e632c246fa am: 307795db5f
  DO NOT MERGE: Fix array casting bug am: e007303822 am: 50c7d097bf