Merge "Merge "Clean up RLog usage" am: 3d0a47e717 am: fc5d525ff6 am: 1f65f27723"