Merge "Fix UserManagerTest waitForUserRemoval timeout."