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

Change-Id: Ib1a57d58e0888eae4a510feff51f33cb2575b6da