Merge "Change some pending OOME asserts to be pending exception"
am: de9b8d63ef

Change-Id: Ie94e3bb027afd3ae98b7aa31d96dd238db30dbdf