Merge "Use Class#getSimpleName instead of KClass#getSimpleName" into rvc-dev am: 88c69840cd am: 04fb018acc am: fe32a82433

Change-Id: Ie191a6044b8bc04ec558ce192a26027e027bf5e6