Merge "Cherry-picked some Autofill Javadoc improvements from master." into oc-dev