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

Change-Id: Ic583de6bb91f92cb6305c5b0493ae286b1254452