Allow blocking for policy distribution.

Change-Id: I7c2af7e983a3a87d9125eb4a742e85557f60de62
WIP: Get

Change-Id: I50d83718d13c0011bcd9d16999fa12a31087e1a6