[automerger skipped] Fix miscalculating large memory allocations. am: 68a632d493
am: fd9872508f -s ours
am skip reason: change_id Id2fd0c38106fa0150ff6baae538ecaea356296ec with SHA1 158f084de4 is in history

Change-Id: I2c3449dc4e51d785aff50506c0c04f104ba41e03