Merge "Skip checking files that have less blocks in block map." into oc-dr1-dev
am: 2998812706  -s ours

Change-Id: I32391594e12726a7e855d7e847da483f07c6dcd3