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

Change-Id: Iaa48181aa1875e77f4752a78de16bd638955e73a