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

Change-Id: I50d5435774368c14148598cf821e51bdefdbcd49