Merge "run e2fsck -f selectively with mount retry"