Merge "Replace old URLs in SampleTest"