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

Change-Id: Idc06ad7587362f58f97c5d5d9f639bc30f2e9f26