Merge "Fix fs_mgr to properly invoke e2fsck on encrypted devices" into jb-mr1.1-dev