Merge "Remove --wipe-and-use-fbe option from fastboot"