Bug 13103 - Enable -P policy support

Summary: Enable -P policy support