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

Change-Id: I1c54215ef9f9ccb4357fb7cec1e22c48ef305bd3