Merge "Fix 2.9-rel compilation issues on LE"