Merge "Fix pointer index out of range exception DO NOT MERGE" into lmp-mr1-dev