Merge "Revert "Annotate StringNetworkSpecifier @Deprecated and @removed"" am: 1413b254eb am: dd2a5c7c69 am: 6011b4e780

Change-Id: I3cd9356b7ad03b3359f5c00da43092fcb7c40035