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

Change-Id: Iecb76ad0e4af41ba88b6988e447d7b5a1e2df0a0