Merge "Update javadoc to give app write better guidence" into jb-mr2-dev