am 026658d5: am 1190e0e4: Merge "Fix mac build"

* commit '026658d5da328108761a1586cabc339917e565ba':
  Fix mac build