Merge "Fix mac build."
am: 4206af2185

* commit '4206af2185bd1d3d0356a8fbc7c5e151fdd261d5':
  Fix mac build.