Merge \"Improve search for available spill slots in RA\"
am: 633c22de95

Change-Id: I10995d473788006890fa0346ffde795e5152d0a9