Travis changes

Change-Id: Idd55ae6627120d0760471a20a78bfafccf668c6f