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

Change-Id: I1b2995172690f586f6d8fc73f83cb2c0b46177b0