Merge "Avoid explict loading of libRSSupport in test"