Merge "DOC CHANGE: Add javadoc to ClipboardManager" into ics-mr1