Merge "Add in-memory storage for listeners  used by RecoverableKeyStoreLoader"