Merge "Fix intdefs that were incorrectly defining "flag""