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

* commit 'feb5a72843ffa6df0140a8c1cfa9c42f6612e19f':
  fix javadoc build