Merge "Use Class#getSimpleName instead of KClass#getSimpleName" am: aac3b2ead0

Change-Id: Ica9acc5b0df4a781a05ae49122978b8ce85b85d3
tree: b9ffa7f6ab26173b6cdde31d6e512552e5b46c05
  1. Tethering/