Merge "Initial implementation of Augmented Autofill."