Optimistic rearranging of rules in hopes of getting a swap.

Change-Id: I8447d309745daa1096a0de0668b1e50443085ab6
Merge "Optimistic rearranging of rules in hopes of getting a swap." into production