Merge "AutoFill Framework refactoring."