Travis changes

Change-Id: I5a4a86effc7718d41d28e525efdcb7c1f0d3ddf5