Merge "Fix incorrect use of TEMP_FAILURE_RETRY"