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

Change-Id: I7f0e03ccebb65e0c9a483adffc4af980ff164a3b