ci: Fixes for travis-ci

Change-Id: I717d7efab8fc1812eec5791ea649c20d96af3087