Merge "Fix darwin build break."