am 019a5f54: am 3e053140: Fix mac build

* commit '019a5f54617fa1cb6637a0212e847550814db7be':
  Fix mac build