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