Merge "Fix bug where PlatformKeyManager did not save generation ID"