Merge "Fix two broken tests in PersistentKeyChainSnapshotTest"