Merge "Fixed name of autofill service on save UI." into pi-dev am: d42963276b
am: d229763717

Change-Id: I29395e888d4cd8a03b2102fff9ba28f3b5bd1d84