Merge "adb: add a way to make the server intentionally leak." am: 9e3f6dbf76 am: f10f25db60
am: c34b307dec

Change-Id: Ifa340ad4f3ce53786391722a7d4f8b97816dfd20