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