am 899214c7: Merge "Fix Mac OS build breakage." into ics-mr1-plus-art
am 899214c7: Merge "Fix Mac OS build breakage." into ics-mr1-plus-art

* commit '899214c7b94b2f21d2fee2b77e2482ea6b18c0d1':
  Fix Mac OS build breakage.

treadstoneproject/artinst,treadstoneproject/artinst,treadstoneproject/artinst,treadstoneproject/artinst,treadstoneproject/artinst