Fix build for shakira

Change-Id: I5fa4dcb4eab9586bd4a4271c7cebc4e08379b8c6