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