Merge "Add missing ifdefs"