Merge "Fix mac build" am: a5c3e44663
am: f110ba8e99

* commit 'f110ba8e990d9bda372df7717b8613edebd72ac9':
  Fix mac build