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

Change-Id: I6d68e5470b640cd0222d60621fddbdd0ba0668a0