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

Change-Id: I86e2d7afdb9039e62441d064d9c678811d8934b7