Merge "Increase timeouts on UserManagerTest."