Merge "Another Autofill counter metric fix (plus some minor doc touches)."