Merge "Minor fix on autofill() javadoc." into oc-dev
am: 211e760408

Change-Id: Iaea8691ad9d7ce3ff1936f966a780a801e508e1f