am e52f0466: am 3e4cac48: Fix mac build breakage.

* commit 'e52f0466fddc264f14de64bf80003f2efffdac4f':
  Fix mac build breakage.