Merge "Add a few leak check tests." am: ed7ca8bb14
am: 9a96618c9d

Change-Id: I2966cccd7712c04c95be5090b1e96d8600b3d5d4