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

* commit 'ea31b47a72a6fed1269e2ba3c29c438212322bf0':
  fix misc doc bugs from external issues