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

Change-Id: I5967cd823a11dc049a593918c29b5950f36ef0e4