Merge "Add test coverage for NetworkSpecifiers." am: 9a029b5262 am: 0e068f6360 am: 8ee38521bc
am: 391c97d506

Change-Id: Ia71b72cc10dba6bac7c8fbe1ab3c5f40bc5506ff