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

Change-Id: Ica095cfa4d341916fdb3ab1f9948c693c9471733