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

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