Fixing CI build

Change-Id: I501891e923ef00b073612ab0fce6fdd90fe228f9