[Bug 225666] Merge Review: crypto-utils