Merge "Add featureId to LocationManager app-op notes"