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