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

* commit 'a4ebda27c9c4c6383520b07d4130b02f0564da27':
  fix javadocs