Merge "Fix setAdministratorUids tests on Q" into rvc-dev