Merge "Distinguish the various pre-allocated OutOfMemoryError use cases." am: 72247af039
am: fb6c68a28a

Change-Id: I8455d8aa2c2d9d2a483aa58b3c46ed94e78d0304