Merge changes from topic "hid-device-app-name" into pi-dev
am: 06d4cda1ac

Change-Id: Ie5c2c261fc1e5348732156e891368b8c5f096130