am 031db879: Merge "Fix intermittent Mac build errors." into eclair

Merge commit '031db8796b5140efb30b21671f32d12137989834'

* commit '031db8796b5140efb30b21671f32d12137989834':
  Fix intermittent Mac build errors.