Merge "Merge "Cherry-picked some Autofill Javadoc improvements from master." into oc-dev am: 6829a1da am: 27eb322e -s ours" into oc-mr1-dev