Merge "Autofill sample: Correctly autofill equivalent W3C fields." into oc-dev am: ea9d8486 am: d5d81c7b am: 2ad18fca Change-Id: Id4f521824c2247c3cea67ebb6792b0e48c6831ce