Merge "Show Autofill Service icon on Save UI." into oc-mr1-dev