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

Change-Id: I581283831c31705ac2dbb344eb1e0bdc0d25e396