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