am 3a38c110: Merge "Fix mac build"

* commit '3a38c110a970c443c09df6a529a78f5b02a870dc':
  Fix mac build