Merge "Insert 2 seconds wait in each test case setup. This is the work around for the surface request race condition."