Merge "Add CertPath to KeyChainSnapshot and startRecoverySession"