Merge "Fuzzy_fastboot must set back the original slot after test"
am: d5b690993b

Change-Id: I7a356d064a6c09cb0c2058e4ee4321816a399ecb