Merge \\"Add a few more pending exception checks\\" am: 6aa9fafbfb
am: d60b0e856b

Change-Id: Ic5c04a679b275a153039bd72c69ead253308d39b