am 3cdf8eb7: am 2a384265: Merge "Fix Mac build"

* commit '3cdf8eb7548bf165c7e202631107d2d7fe2af943':
  Fix Mac build