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

* commit '7cd49c6c3a2678510a278f28514c73dcbaae8957':
  Fix pointer index out of range exception DO NOT MERGE