Merge "Add test for non-GC'd parcel."
am: e51ae7f060

Change-Id: Iaf2cbd6a6bb57752d38a3e3f778e70298740bd92