uhid: backport from 3.4

Change-Id: I4ac52ad44185c149e5f7b260af783f15abc8c0cd