Missing portion of "Free as much memory as possible ..." commit

Change-Id: Ic43feb5793171f7607d51b3f235d42dee575d4c2