am 86ddbbf4: Merge "Delete password as per block encryption"

* commit '86ddbbf4143daa721b84f0f253022d19d61b6fe3':
  Delete password as per block encryption