Merge "Rename AllowedNetworkType to AllowedNetworkTypes"