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

* commit 'c2d92db8c0ca3d9d045f5f710f4d90db8684b439':
  typo