Merge "Fix OffloadControllerTest on R"