Merge "Fix UserLifecycleTest."