Merge "(Backport) Pipe though componentId from caller to permission checks" am: 574d0b7bd3 am: 10e78ef453

Change-Id: I910041ca7cc57d54a778658823f2ca87f4bbdbdd