Allow blocking for policy distribution.

Change-Id: I5a4c02dc13c9d57c49b9c5eedecc6cac9b7110b4
WIP: Get

Change-Id: Id5383319bc52531f31238354a638f0030402334f