Merge "DO NOT MERGE - Backported some Autofill Javadoc improvements from master." into oc-mr1-dev