Merge "Fixes testRequiredSplitRemoved failed in SplitTests"