Merge "Properly handle the autofill provider names, making sure place holder name is properly filtered out." into main