am 52657361: (-s ours) Merge "Fix pointer index out of range exception DO NOT MERGE" into lmp-mr1-dev automerge: 28a4cea  -s ours automerge: 7cd49c6  -s ours

* commit '52657361d04719f62b9cea57ea9d0e8c780ce874':
  Fix pointer index out of range exception DO NOT MERGE