am 05753f53: am 92736efa: Another fix for encryption

* commit '05753f5380e4bc678ae9bf11b8b6adb6c56f33bf':
  Another fix for encryption