am 78c984ae: am 5835ac9e: Merge "Only check caller when deriving permissions." into klp-dev

* commit '78c984aef222654bd337ae7f466a526e23db8f07':
  Only check caller when deriving permissions.