Merge "Skip checking files that have less blocks in block map." into...
Merge "Skip checking files that have less blocks in block map." into oc-dr1-dev am: 29988127 -s ours am: b67fd59f
am: 73a662b1
Change-Id: I665d903984b655b1c052e749c44597a7ce4243be