Merge "Use Class#getSimpleName instead of KClass#getSimpleName" into rvc-dev