am 615af25f: am a421c1e5: Merge "Possible Mac build fix."

* commit '615af25ffdde99331c173499446e08c3a7ec32a8':
  Possible Mac build fix.