Merge "Revert "Annotate StringNetworkSpecifier @Deprecated and @removed"" am: 1413b254 am: dd2a5c7c Change-Id: Ia4912e6328ee83b0d8ecaf7f97833c180f7d3055