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

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