Check for conflicting blocks after sanitizing the range

Bug: 63552
Change-Id: Iba7743795dec74ec03f9a2e6e68aa70a525df3e1
Merge "Check for conflicting blocks after sanitizing the range"