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

* commit '201cc84d84e8fa2f2beba9a9a93a115f73a0b0da':
  Only revoke ownerless grants when unprivileged.