Merge "Optimize AutoFillManager calls"