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

Change-Id: Ia9a79422b465c3a20134be1029824ef12bbb4c4c