Merge "Autofill Partitioning: support multiple SaveInfos." into oc-dev
am: 5c8d88e855

Change-Id: Ia363ebbbf73514936776b7b0a9ca7ba0f65bf1bc