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

* commit '3d33c68f9e0ddc3b022e027e7644e908cfc9725e':