Merge "Take new autofill structure for each partition" into oc-dev
am: f40d1cb773

Change-Id: I0da0d98bb03d5a1d6156950e9f557115f232c3fb