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

* commit 'f6e429531620688fa00bfae0cda4ec04d9c7d4ec':