am 919910cb: am 4c9cc440: Merge "Ensure that mixed permission policies return...
am 919910cb: am 4c9cc440: Merge "Ensure that mixed permission policies return the right result" into mnc-dev
* commit '919910cb':
Ensure that mixed permission policies return the right result