am 31d73dce: am 2bdf89b1: Merge "DO NOT MERGE Fix typo" into lmp-mr1-dev

* commit '31d73dce255db34e68ee77bba8c48541378004dd':
  DO NOT MERGE Fix typo