Merge "(Backport) Pipe though componentId from caller to permission checks"