Merge "Fix pointer index out of range exception DO NOT MERGE" into lmp-mr1-dev
automerge: 28a4cea -s ours
* commit '28a4cea5a0f8d0e33b9d6a3283d31cc1e976c74c':
Fix pointer index out of range exception DO NOT MERGE
This commit is contained in: