Merge "Autofill metrics improvements:"