Merge "Add platform key generation ID to WrappedKey instances"