Merge "Change HardcodedFlash to add flashtasks"