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

Change-Id: If0ead77d654df02f87f8878d8c800a207d6900ce