am bea313f7: am 2b562f40: Merge "Some heap cleanup"

* commit 'bea313f78251bc16d4788eb2d3d4c3b94beaafee':
  Some heap cleanup