Merge "Modify TestApps to use mandatory source URI" into oc-mr1-dev