Merge "Add 4 new fields to KeychainSnapshot"