Merge "Fix compile error in different build variant" into main