Merge "Catch one more DeadObjectException." into udc-dev