Merge "Revert "Cryptographic security for MAX_BOOT_LEVEL""