am 5b65be96: am 370c27c7: am 705ba960: Merge "Qualify the uid with the userId when granting permissions" into mnc-dev

* commit '5b65be96ab061cbdba479795ff467c0eab92c28a':
  Qualify the uid with the userId when granting permissions