Support for new file-based encryption paths.
am: c821cc2e19

* commit 'c821cc2e190607db18e1e1cbae126de57383fabd':
  Support for new file-based encryption paths.