Merge "Qualify the uid with the userId when granting permissions" into mnc-dev