Merge "Disable leak detection locally."
am: b968753ab5

Change-Id: Ia305c3d30a89453ac839109cdfa777bf3e97115e