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