Merge "Use Class#getSimpleName instead of KClass#getSimpleName" into rvc-dev am: e833790a am: dc37f94f Change-Id: If2085438daf43081c67d5174aca07ed7e3055327