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