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

Change-Id: If27ce3aa849edc5d36dbd3cc2c03d802639b8183