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

Change-Id: Ib2924dae99bfe132a56a1583ecf4a88f833d3937