Merge "Fix crash-loop on wiped FBE device." into nyc-dev