Merge "Make component names visible in javadoc."