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

Change-Id: I245fc0402f526f2e1ad512c3df5f885856193c5c