Merge "Revert "Annotate StringNetworkSpecifier @Deprecated and @removed""