Merge "Minor Autofill javadoc fixes." into oc-dev am: 560221752e am: 948e9ff4d3 am: 017c0192d7
am: 8f71607fda

Change-Id: I5ca406f0d5635184dc05746efe9d382a306bce3e