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

Change-Id: I468b69ea14824dd640dda35142586a2d76f82230