Merge "Replace the permission of internal connectivity checks"