Merge "Fix incorrect parsing of UVC interface descriptor" am: 74458cbdf0
am: a05a067674

Change-Id: I55d4804312a1d127b7fff0683902e30c7fa06e90