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

Change-Id: I2df695e6699362940052d672fa0ee02fffde2994