Merge "Disable leak detection locally." am: f07daf2bce am: 31a33c135a
am: 158a01d3f0

Change-Id: I5a468ef84255ce43fff81db0df2ed1aa9ebb28cb