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

Change-Id: Ied8bf9f4dc83ac96f7e50b76b41c63d3e36621c7