Merge "Fix mac build" into nyc-dev
am: 8a1d0a446f

* commit '8a1d0a446fc3d59b006cbec7fc398593e87b8330':
  Fix mac build