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

* commit '1915dd56e3cdc73d4d83453971486b64880e4603':