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

* commit '2caba1f763faf0656e2f27a9a422ada5908488c2':