Merge "Modify TestApps to use mandatory source URI" into oc-mr1-dev
am: d9b191461c  -s ours

Change-Id: Ia38c47860d1341867e51e5e701c4608301aca8de