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