Merge "boot_control: Don't allow current_slot_ to be -1." am: 9c0f102828 am: 0c34ef807b
am: 185013413e

Change-Id: I6a3c4bdaefca35eb23c362981bef43169cb9fcb0