Merge \"Also catch OOME from the new byte[].\"
am: 172abeb725

Change-Id: I363ef0c5151cb2d34642a996149230ac46421998