Merge "Fork UserLifecycleTests to make tests realistic"