Merge "(Backport) Pipe through featureId from caller to permission checks."