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

Change-Id: I90a42739dfa01c49fdbf799c49e3d569abcedf11