Merge "More fine-grained exception handling so we can still use non-excepting descriptors." into oc-dr1-dev am: 84a60bf9e8
am: 6899fa6c81

Change-Id: Ic70707c334e9765e7f196bdcb0d2d753ce17b0fb