uvc cherry pick: 8ca5d2d8e58df7235b77ed435e63c484e123fede

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>