Merge "Make getNetworkSpecifier() public API." am: ad60ef88e0 am: 31f969ba66

Change-Id: I884c4e4c9ed891594845d599358f19f4a8e2ad60