Merge "Minor Autofill javadoc fix." into oc-mr1-dev