am 3cc51480: am d6b2b65d: Merge "Change init sequence to support file level encryption" into mnc-dev

* commit '3cc5148007a7ad2ff0b868ae89c7835286dd148c':
  Change init sequence to support file level encryption