Merge "Fix a test broken by fragment migration."