am 4150611d: Merge "Fix mac build."

* commit '4150611d5229c87e49762b9edf6540995eb325e1':
  Fix mac build.