Merge "Minor autofill changes to support compat mode CTS tests."