Merge "Disable leak detection locally." am: b968753ab5
am: 1c13c899cb

Change-Id: I2ef23de47f401165b7246bdd3de3797e60d47392