Merge "Fix symmetric key generation in strongbox" into pi-dev