Merge "Skip checking files that have less blocks in block map." into oc-dr1-dev