Merge "Add javadoc and unhide new API"