Merge "Annotate StringNetworkSpecifier @Deprecated and @removed" am: bd5a33f03b am: df2c3924ea

Change-Id: I6b999efcdf3c21325bdbd3a7b516bfbb9354a362