Merge "Add test coverage for NetworkSpecifiers." am: 9a029b5262
am: 0e068f6360

Change-Id: I376b9011aaae7f0b8a2899a942d1a43e26605101