Merge "Fix encrypt-and-wipe" into lmp-mr1-dev