Merge "Fix mainline_mixed build"