Merge "Replaced auto-fill by autofill to keep it consistent with API style."