Merge "Reland "Fix DebugClassKillSwitchTest to handle missing classes."" into sc-v2-dev