Merge 0a5d8be23605bd66edca189efd781498c1ad6c6d on remote branch

Change-Id: Ib4221264a03340445bd7a7783cd78940a393a9bc
diff --git a/processor/src/main/java/com/google/android/enterprise/connectedapps/processor/DispatcherGenerator.java b/processor/src/main/java/com/google/android/enterprise/connectedapps/processor/DispatcherGenerator.java
index a4f8ef6..f8733d1 100644
--- a/processor/src/main/java/com/google/android/enterprise/connectedapps/processor/DispatcherGenerator.java
+++ b/processor/src/main/java/com/google/android/enterprise/connectedapps/processor/DispatcherGenerator.java
@@ -184,7 +184,7 @@
         ArrayTypeName.of(byte.class));
     methodCode.addStatement("throwableParcel.recycle()");
 
-    methodCode.addStatement("$T.throwInBackground(e)", BACKGROUND_EXCEPTION_THROWER_CLASSNAME);
+    // methodCode.addStatement("$T.throwInBackground(e)", BACKGROUND_EXCEPTION_THROWER_CLASSNAME);
 
     methodCode.addStatement("return throwableBytes");
     methodCode.nextControlFlow("catch ($T e)", Error.class);
@@ -199,7 +199,7 @@
             ArrayTypeName.of(byte.class));
     methodCode.addStatement("throwableParcel.recycle()");
 
-    methodCode.addStatement("$T.throwInBackground(e)", BACKGROUND_EXCEPTION_THROWER_CLASSNAME);
+    // methodCode.addStatement("$T.throwInBackground(e)", BACKGROUND_EXCEPTION_THROWER_CLASSNAME);
 
     methodCode.addStatement("return throwableBytes");
     methodCode.endControlFlow();