Merge "Modify TestApps to use mandatory source URI"
am: 4fdda723bb

Change-Id: I1d8c8851d4c5a24482760183716d9efde47a3f4c