Merge "Check exceptions in BBQ and SC JNI code" into udc-dev