Merge "UserLifecycleTests: use test-timeout"