Merge "Move the trusted root CA certs for RecoverableKeyStore to our own folder" into pi-dev