am e657f0fb: am c69095d8: am afb8f320: Merge "uncrypt: Support file level encryption."

* commit 'e657f0fb8ec21b09831ed19d18ba05a7630a4fb0':
  uncrypt: Support file level encryption.