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

Change-Id: I5b57bf3a4158ac31f3e440d13efe80a14d320df3