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

Change-Id: Iee7646341eb891e48a51b082563bd3df2368c206