Merge "Add RecoverySession importKeyChainSnapshot method" into pi-dev