Merge "Make StringNetworkSpecifier @SystemApi" am: fbceb58514 am: a4fbf15adf am: a7d60e5103

Change-Id: Ia7e749b8953ce16a770dfe2a32e8407c6b22eecd