am b7f0702e: (-s ours) DO NOT MERGE Use default key permissions for ext4enc

* commit 'b7f0702ea6cc32c58540d596016c2dabd8ba3541':
  DO NOT MERGE Use default key permissions for ext4enc
  DO NOT MERGE Simplify password checking logic