am f0654b44: (-s ours) am c69095d8: am afb8f320: Merge "uncrypt: Support file level encryption."

* commit 'f0654b4414c750703f50d4e84319d31d57e86284':