Merge "Clean up RLog usage"