Multiple policies

Change-Id: I0976b9be37346357a1625ba89c1361ca28b5715f
Merge "Multiple policies"