Merge "Fix mac build." am: 4206af2185 am: 1f47140101
am: 4c74944347

* commit '4c7494434719fa218eef3c3e72c98777b7407d11':
  Fix mac build.