Merge "Fix symmetric key generation in strongbox"