am b7412211: am 456661e3: Merge "Fix Mac build."

* commit 'b741221117695238734126f0a643f127ba5cee0e':
  Fix Mac build.