Merge "Added more metrics for Autofill:" into oc-mr1-dev