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

* commit 'e91699fe2106277a136ed714a2da67e6e729da77':
  Fix mac build