Merge "Fixed basic autofill services broken on previous CLs." into pi-dev