Merge "run e2fsck -f selectively with mount retry" am: 380a3bb4c2 am: 3794d11454 am: 7536c043fc
am: 4ba7f8e005

Change-Id: I712ed21f05858d25248e40b0f6b91c49f166280a