Merge "Prevent infinite loop on zero length USB descriptors" am: a40c30d172 am: ff3df3f1d7

Change-Id: Ie6c52366aa19fcf55e891f655f534939f128251d