Merge "run e2fsck -f selectively with mount retry"
am: 380a3bb4c2

Change-Id: I3411d17aa175b608172dbc7cec253f66bc157536