Merge "Do not allow opting out from the new permission model." into mnc-dev