am e6c4fb00: Merge "Only revoke ownerless grants when unprivileged." into lmp-dev

* commit 'e6c4fb00791653ab12302b16dedb2e9696bd0103':
  Only revoke ownerless grants when unprivileged.