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

Change-Id: I767c90822b24520666d3a17f23a334a08b1555dd