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

* commit '3bbec99fa2d9bc1d01d80c4a46fc5e1daf654f50':
  Only revoke ownerless grants when unprivileged.