Merge "Remove StringNetworkSpecifier" am: bdbc3e7e4e am: fa25f2f38c am: ec06afee8a

Change-Id: I60c9e49085701e05bddbed6a8735e6973e9f2986