Merge "Moar Autofill Framework javadoc improvements:" into oc-dev