Travis changes

Change-Id: Ie4f3f771c1ddb0d6854486d9290e28e06296ecd9