am f2e28abb: Merge "Update javadoc" into jb-mr1-dev

* commit 'f2e28abb1375c5ca513eac9dcde5c349f771de0f':
  Update javadoc