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

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