Merge "Some minor Autofill javadoc improvements."