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