Merge "Fixing 'No data transfer' mode in USB configuration" am: e8da6089 am: 0df25171 am: fb717b6a am: c726e205 Change-Id: Ibe40e68ed21615d8fa12137ecc9e7774137fde5b