Adjusting policy interfaces

Change-Id: I39f5100ca3e407dc7e536e8c4bd938d251625114
Merge "Adjusting policy interfaces"