am fb5e6bbd: Merge "fix javadoc build" into jb-mr2-dev

* commit 'fb5e6bbd2bf9ad8a71fc798be3ef12b950476f43':
  fix javadoc build