Merge "Ensure that mixed permission policies return the right result" into mnc-dev