Merge "Remove StringNetworkSpecifier"
am: bdbc3e7e4e

Change-Id: If2b9e1ef7341b517cb0090ba0ff882b1a6305ed4