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

* commit '88d9710483c07c6fe985018e276532a2c480df81':
  DO NOT MERGE: Make component names visible in javadoc.