Merge "Changed FlashTask and RebootTask to take in FlashingPlan"