Merge "Change to use ComponentName instead of String in log." into rvc-dev