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

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