am 92736efa: Another fix for encryption

* commit '92736efab068bdbfeb1177544907b84511fb04e0':
  Another fix for encryption