Merge "Fine tune the Autofill Save UI" into oc-dev
am: ede054a73e

Change-Id: I0f23b28dbb8da1a3182411223bb3edde09fb56d8