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

Change-Id: I5d0a4a359dad57580b43b20d148ec3e47e2bbf76