make test less flaky on Chrome

Change-Id: I179900aa9a56372646720fc319214710e7b4dbce
Merge "make test less flaky on Chrome"