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

Change-Id: I80bd1592ca2b093e263f2ddfedc174dc401ec567