Merge "Allow tuning of heaptargetutilization" am: 0e3e2a73c6
am: e673072feb

Change-Id: Ia7114c1d9fbee42ce27372947702c580bfd3159c