Merge "Initial implementation of autofill partitioning." into oc-dev