Merge "Fix multiuser CTS tests"