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

* commit '27ad058a941e742bc519b76d3a7940f31f988f1f':
  Fix Minor typos