am 4fae0620: am 27ad058a: Merge "Fix Minor typos" into jb-dev

* commit '4fae0620ce46ba4ba6eebdf3d4edb96c78ef6dd7':
  Fix Minor typos