Merge "bugfix: testapi is killed because of oom_kill"