Merge "TrivialFix: Remove cfg import unused"