Merge "Improve autofill perf test."