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

Change-Id: I6f7ffbb68e8e87410009ad74e5019d24cab55ca1