am 43fa53c4: am 34f083b1: Merge "Fix mac build"

* commit '43fa53c42871bc565b40a19a1bc7761d30881ba6':
  Fix mac build