am 88d97104: am d9818244: Merge "DO NOT MERGE: Make component names visible in...
am 88d97104: am d9818244: Merge "DO NOT MERGE: Make component names visible in javadoc." into ics-mr1
* commit '88d97104':
DO NOT MERGE: Make component names visible in javadoc.