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

Change-Id: Ie9357578dfa09cb05c27dff78949222ad9796d2d