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

Change-Id: Ife574a028ce662eadb58f8eab2b9f3601acd9bd0