Merge "Update logic for checking NetworkSpecifier"