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

* commit '5835ac9e31aea910adb6b9d2de1d63df771df45b':
  Only check caller when deriving permissions.