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

Change-Id: Ia6a4b774dc57493112d3618c46190d4b439ce3e6