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

Change-Id: I322ab59aa9600b7deb5a48f2e6fc6e012053b8f3