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

* commit '370c27c7fe308e351d375295d422df76f7ede164':
  Qualify the uid with the userId when granting permissions