am 922e038b: am ea31b47a: Merge "fix misc doc bugs from external issues" into jb-dev

* commit '922e038b087076260ae7e29facc8121d46e8ba3c':
  fix misc doc bugs from external issues