Merge "Run HeapLocationCollector once in scheduler instead of locally." am: 80dd7567f7 am: 46431d51cc
am: 48d97e6155

Change-Id: I3b874a181c51fd15835940ec92bd8df7255d923f