Merge "Update javadoc for EXTRA_SHOWING_ATTRIBUTION"