Merge "Fix timeout in a test utility method" into nyc-mr1-dev