am 3ac4765a: am 1915dd56: (-s ours) am 10cf0942: Merge "Revert "Change init sequence to support file level encryption"" into mnc-dev

* commit '3ac4765a14334f0aa574b5cffb5349cc1c214cfe':