Merge "[automerger skipped] Avoid read out of bounds am: 9d33304e am:...

Merge "[automerger skipped] Avoid read out of bounds am: 9d33304e am: e2a8a1e3 am: 726b9eb5 am: 0fc277db am: b2c01cbb am: ba1dcc15 am: 795726df -s ours am: 72642916 -s ours am: 0dd6b4d2 -s ours" into tm-d1-dev-plus-aosp