Upping heap to something reasonable

Change-Id: I2fc2fd2684011f34a9c3685db820c0e72dcba929
Merge "Upping heap to something reasonable" into production