am 4abb81b8: am 01c2b053: Merge "Fix mac build"

* commit '4abb81b894d97e9924aa47bcc101d8721cfb59d0':
  Fix mac build