Merge "Use Class#getSimpleName instead of KClass#getSimpleName" into rvc-dev am: e833790a am: 791af708 Change-Id: Idfe54387a331f532040ea3986eb7948e24ea7304