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

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