Merge "Use hasInternetPermission method" into nyc-dev