Merge "New attempt at fixing mac build." am: 620021e643 am: 658a94f94c
am: 2ba3611b78

* commit '2ba3611b780fc2be9b98376f4ce033f9fee8860f':
  New attempt at fixing mac build.