am 9f521ed2: am e3b5cb50: Merge "Workaround apparent clang compilation issue"
am 9f521ed2: am e3b5cb50: Merge "Workaround apparent clang compilation issue"

* commit '9f521ed259ee48ad0b64afa285f1607a90ad99d2':
  Workaround apparent clang compilation issue

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