Merge "Clean up RLog usage"
am: 3d0a47e717

Change-Id: If4f1a1adfe13f941e23244a9aeb03ae535e2c4c5