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

* commit 'bcd6f76ac9ebcf1745f1cfce975d8e9835cd4bab':
  typo