Merge "[Expand metrics for Autofill]" into tm-qpr-dev