Travis changes

Change-Id: I42ebe753ada16b81548c1291fdeff0f3205ef27c