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

* commit 'b6b31549dfe3c9ec6b32e2862ee7e08a949e2f9c':
  Revert "Change init sequence to support file level encryption"