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

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