am 3d252fdd: (-s ours) am d536dbd6: am 290059fb: Probably fix the mac build.

* commit '3d252fdd97fe3a2f5c5085057302304a132a2ed0':