Reduce 2030-long-running-child heap requirements am: 7eca3779b7

Change-Id: I0bc64e309fc56f901a54c97c098901fdc9dc257c