Merge "Fix questionable behavior for the bulk region clearing"
am: fb5b7d8210

Change-Id: I935895ae537f1a0219fc5e654b9df3c5703cf808