Try to avoid expensive stack walk in QuickDeliverException am: 1cbac5c38c
am: eee9b1244c

Change-Id: I0cc95af952b6149e43d285cfdf9c0d2b960c1e44