Merge "Fix USB OTG hot plug out nndexOutOfBoundsException"