Merge "Fix setAdministratorUids tests on Q"
tree: eb6f3f35f4639802c30875f594bb7dca573b9890
  1. core/
  2. services/
  3. tests/