am c10d90bc: am 201cc84d: am 3bbec99f: am e6c4fb00: Merge "Only revoke ownerless grants when unprivileged." into lmp-dev

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