am 1626b98c: am 7fd51b36: am b20fa762: Merge "Fix fs_mgr to properly invoke e2fsck on encrypted devices" into jb-mr1.1-dev

* commit '1626b98c5b1d4755f0f146698d487732dcc0a2cc':
  Fix fs_mgr to properly invoke e2fsck on encrypted devices