Merge "KeyDerivationFunction: example about treating data encrypted via SHA1PRNG" into nyc-dev