Merge "Couple autofill fixes." into oc-dev
am: 5fd8672d71

Change-Id: I767486242a6c8494e70710622029b9e03d621a9e