am c16d1448: am b2ded18a: Merge "resolved conflicts for merge of fb30a783 to lmp-mr1-dev" into lmp-mr1-dev

* commit 'c16d1448bb139384cc86d14d9412ffe1a62817c8':
  Fix typos in previous bugfixes.