Merge "Use Class#getSimpleName instead of KClass#getSimpleName" into rvc-dev am: 88c69840cd am: 601193a68e am: 5ba4e8018e

Change-Id: I419045f62d9d1f15b5764c301dcb190fd6ccc349