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