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

Change-Id: I58f93768b670bb5c7d8793a199c5973dc5e3e00c