Merge "dump package name" am: 7113ec2cb4
am: 35c5782bb9

Change-Id: Iccde4ec00fb099766a3157b571c36a2d184622d3