Fix fatals under MW 1.24 + bump time and memory limits

Change-Id: If467f508c2aec208686bcc271df9fb8d8010d80f