Fix travis tests

Change-Id: I2ed1a153e0579c4d4af554f35774b113170141a6