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

Change-Id: If2085438daf43081c67d5174aca07ed7e3055327
tree: 25f2ed2beeeb9a74beba7758da2ad2e3b4a9caad
  1. Tethering/