Merge "Unhide KeyStoreKeyProperties.Origin.UNKNOWN."