am d2caad30: Merge "Fix mac build (second attempt)"

* commit 'd2caad30be6598c78f900bb27738466875efaeec':
  Fix mac build (second attempt)