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

* commit '9a795187ee7cd75cf5398c8e7f3c6137a1913853':
  DO NOT MERGE Delete password as per block encryption