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