Track packages with various changes

Change-Id: Iab67d6a0ce0819fc57f34ec2f42dc9e34cf74d55