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

* commit 'ed40f2a6811909565cc1a644f249ef77ece541bc':