Merge "Refactors in advance of crypto-secure boot level"