Merge "Fixed size of autofill service icon on Save affordance." into oc-mr1-dev
am: a8c2b36b33

Change-Id: I771b71a9c189c7eeae30524bd155b5e4f94ad681