am 1efc6e52: am 1d13f13d: Merge "Adapt to underlying changes in the PBKDF2...
am 1efc6e52: am 1d13f13d: Merge "Adapt to underlying changes in the PBKDF2 implementation" into klp-dev
* commit '1efc6e52':
Adapt to underlying changes in the PBKDF2 implementation