Merge "DO NOT MERGE Fix typo" into lmp-mr1-dev