Fix random failing tests on travis

Change-Id: I84a37d64796a89c12cebd1260f578268a6fe3911
Merge "Fix random failing tests on travis"