Merge "Fix mac build"
am: a5c3e44663

* commit 'a5c3e44663c3b9c97fe350b4191cec079738fca3':
  Fix mac build