Merge "Skip checking files that have less blocks in block map." am: aa599f3916
am: 6b8eeb0bf4

Change-Id: I25cb9e06ddcb47b2ab6b76a4fb6219bf62b6a47e