Merge "Autofill sample: Correctly autofill equivalent W3C fields." into oc-dev am: ea9d8486 am: d5d81c7b am: 9072d7a6 am: d3c81c64 Change-Id: Id35d9fa5b3adb05a182a0d7e5197aca56eabfe67