am b1672806: am 60430803: Merge "Fix Mac build."

* commit 'b1672806e20714cf5f748157d480eabee715e58d':
  Fix Mac build.