Merge "DOC CHANGE: Package text and Formatter javadoc" into ics-mr0