Merge change 20330

* changes:
  EventHub: pass the name of each input device up to Java