Merge change I85967b66

* changes:
  Encrypted File Systems Project.