Merge "Fixed 2 Augmented Autofill issues:"