Merge "Remove StringNetworkSpecifier" am: bdbc3e7e4e am: fa25f2f38c

Change-Id: Icfcb1c81fa88d87cca025743779b01d32e91cdf4