Merge "Disable smartlifecycle in tests"