Removing redundant parameters from methods of policies

Change-Id: I65fa5ef654bb407166b5153aa5452c6181462dfb
Merge "Removing redundant parameters from methods of policies"