am 6ce3887a: am 707e6321: Merge "typo fix" into jb-dev

* commit '6ce3887a62e99586172af7aec8ea54a71e56e634':
  typo fix