Merge "Fix setAdministratorUids tests on Q" into rvc-dev
tree: 1769701b7a442f65ce1cd2b2cdd75f406cfb87d7
  1. core/
  2. services/
  3. tests/