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

Change-Id: Id369015b6c080af2049c7ac00092213b2aa01872