Reprioritize partitioning so we get a swap.

Change-Id: I38a4c70de39e41e142337a481144a137ee0b4356
Merge "Reprioritize partitioning so we get a swap." into production