Merge "More uniformly capture package information" into pie-cts-dev am: fa3ea721be am: 78aa01dae6 am: 504b590432 am: 874a2100ac am: c3c36fd8b2

Change-Id: Ic9983677f78d8192615e471341b93029e5446571