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

Change-Id: I01a657cea55d39fc8dc9ddfa04ff60783eaf993b