Merge "Modify TestApps to use mandatory source URI" am: 4fdda723bb am: 29ae3d08fe
am: 3befcd863d

Change-Id: If92c54d22cfc8caf9d0f9caeff6f2a6e0747072f