This should reduce the memory overhead of these processes Change-Id: I02be84d079f3effe559bd501622642f1c9601b45