Merge "Set pkg name in some "leaf" CTS Manifests." am: ad6ac75a1e am: 0ba4224463
am: 9f15687103

Change-Id: I3c545fff64cdffd45efddf4db715f847d3149478