Merge "Minor Autofill javadoc fix." into oc-mr1-dev
am: 7fecc73f52

Change-Id: Ia1dafe5e6be8df7b331f735da1d0c59c72f68891