Merge "Fix build break on Mac."