Merge "Add featureId to network location checks."