Merge "Fix pointer index out of range exception DO NOT MERGE" into lmp-mr1-dev...
Merge "Fix pointer index out of range exception DO NOT MERGE" into lmp-mr1-dev automerge: 28a4cea5 -s ours
automerge: 7cd49c6c -s ours
* commit '7cd49c6c':
Fix pointer index out of range exception DO NOT MERGE