am adff8b75: Merge "Add Javadoc" into jb-mr2-dev

* commit 'adff8b7577490bbeaedcd584a19eb5310f6ccbc5':
  Add Javadoc