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

Change-Id: Icae3c879ca1abbd556a08d494556da14e92f2c12