Merge "Also catch OOME from the new byte[]."