Merge "Change 1/2 spill slots to more general number of spill slots." am: af818fab0a
am: 090c495d37

Change-Id: Iacf762f5baf284579d3f43a915be165d91ebd0ae