Update for R16 crypto changes.
Merge.