am 34f083b1: Merge "Fix mac build"

* commit '34f083b1f3d45e60fb60bd11f9af0515cc3255fa':
  Fix mac build