Merge "Make RSBase and RSBaseCompute public to work better with unit test framework"