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

Change-Id: I8ecfaf8fc5ff9fac07027e518eace6798a89ffae