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

* commit '380d571a65ec6866768c74e3ff360a6620b0d212':
  fix javadocs