am e8308f85: am 81046166: Merge "Revert "Change init sequence to support file...
am e8308f85: am 81046166: Merge "Revert "Change init sequence to support file level encryption"" into mnc-dev
* commit 'e8308f85':
Revert "Change init sequence to support file level encryption"