Merge "Revert "Revert "Change the root of trust for CryptAuth Vault Service""" into pi-dev