Merge "Minor Autofill javadoc fixes." into oc-dev