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

Change-Id: Id9e34a3b1a965c173e4fea77c5357fe8d95ceb85