Minor fixes in policy module

Change-Id: Ibcf4e734a3d36b04266fae9b6d18cf3b10c4537a
Merge "Minor fixes in policy module"