am be467349: am c2d92db8: am bcd6f76a: Merge "typo" into jb-mr2-dev

* commit 'be4673494dda3072dd1cea9a968f4524100f382c':
  typo