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