Merge "Add support override OS_TEST_TIMEOUT for all environments"