am 86c942a2: (-s ours) DO NOT MERGE Delete password as per block encryption

* commit '86c942a2537701a90b88768eab4648c0650dfad1':
  DO NOT MERGE Delete password as per block encryption