Merge "Asserting flashing plan is used in do_flash" into main