Merge "Fix build break caused by missing ifdefs."