Fix for randomly failing Kookoo tests.

Hopefully this will fix it, I cant reproduce the fails locally.

Change-Id: I31fe25f33634babc3ca9a47f92a804f327601453