Merge "Fix FLAGS_ALL_CONTROL to match more recently added flags."