Merge "Disable leak detection locally." am: 319a93e363 am: 9f3008d455
am: 58db2dcc96

Change-Id: I7b7eeae8ce6c446a4b0ce2530a52c5a4bae65cab