Merge "Report less data in structure to autofill provider" into oc-dev
am: d19113b390

Change-Id: I492245dee87450b1b54fef2c06c600ac290adffe