Merge "Fixing 'No data transfer' mode in USB configuration" am: e8da6089ac am: 0df2517181
am: fb717b6ab2

Change-Id: I34846199e446031423b767aa66b1bd2987cf6d4c