Fix build breakage caused by bad merge.
Fix build breakage caused by bad merge.

Change-Id: I942488129535badda5ecee6baddac6ecb370afff

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