Optionally place a local block when globally blocking

Bug: 17824
Change-Id: Ic8c4492396aa6bd2762fe65841d224484aeebead
Merge "Optionally place a local block when globally blocking"