Merge efbcbe6a7321027fac668e3b91f9250e79e4e82e on remote branch

Change-Id: I1877b2d8ec31d4278f190a600fac53405a2a6ba7
diff --git a/etc/init.qcom.usb.sh b/etc/init.qcom.usb.sh
index 2a73578..fe02387 100644
--- a/etc/init.qcom.usb.sh
+++ b/etc/init.qcom.usb.sh
@@ -82,7 +82,7 @@
     else
 	  case "$(getprop ro.baseband)" in
 	      "apq")
-	        if [[ "$target" == "neo" ]]; then
+	        if [ "$target" == "neo" ] || [ "$target" == "anorak" ]; then
 			setprop persist.vendor.usb.config diag,qdss,adb
 		else
 			setprop persist.vendor.usb.config diag,adb
diff --git a/etc/init.qti.usb.debug.sh b/etc/init.qti.usb.debug.sh
index 15dcb3b..3e77d14 100644
--- a/etc/init.qti.usb.debug.sh
+++ b/etc/init.qti.usb.debug.sh
@@ -70,5 +70,11 @@
     echo 1 > $tracefs/instances/usb/events/rpm/rpm_resume/enable
     echo 1 > $tracefs/instances/usb/events/rpm/rpm_suspend/enable
     echo 1 > $tracefs/instances/usb/events/rpm/rpm_return_int/enable
+
+    #xhci
+    mkdir $tracefs/instances/usb_xhci
+    echo 1 > $tracefs/instances/usb_xhci/events/xhci-hcd/enable
+
+    echo 1 > $tracefs/instances/usb_xhci/tracing_on
     echo 1 > $tracefs/instances/usb/tracing_on
 fi