Fix timeout in a test utility method am: a210ccfab7
am: 56542a3e1c

Change-Id: Ib4a3c82160dd89afabd63ff4ef3131a75072ac15