Merge "Add a test to target app setup and related XML." am: 74d214249e
am: ffff707221

Change-Id: I3aece84d41c73f39d3c2c71ee29eb9d233368264