am f15b0908: Merge "fix javadocs" into jb-mr1-dev

* commit 'f15b0908a773850007c0d0b6de54b1dc008abf6f':
  fix javadocs