Revert "bypass policy requirements"

This one gets in the way of the 4.4.3 merge. We'll revert it for now and try to pick it and apply it over 4.4.3 instead.

This reverts commit b5f35aea5e6afcfc92a7511dfdd4a4fc5c07ca9f.

Change-Id: Ice4d922151852f4b081ae6babbead068f1a66d7c