cherry-pick ahead of the automerger: Merge "Revert "Fix the mac build.""
10 files changed