Merge "Change to use ComponentName instead of String in log." into rvc-dev am: 7af9c771bd
am: 03b2025b1d
am: 717a89511c
Change-Id: I725c86b9878696b86585d09d6b3b68c035c26a42
This commit is contained in: