Merge "Minor fix on autofill() javadoc." into oc-dev