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