am f2dc6fc4: Merge "Fix Javadoc." into jb-dev

* commit 'f2dc6fc442385e08745762fcc2468ad89e2c78dc':
  Fix Javadoc.