am 7624d0d8: (-s ours) am d6b2b65d: Merge "Change init sequence to support file level encryption" into mnc-dev

* commit '7624d0d830ad6b185f0ba50f5ffd8b0e20386228':