Merge "Change some pending OOME asserts to be pending exception"