Merge "Enforce more specific service access."