Some cleanup in ReferencedUrlFinder related code

Change-Id: Ic2209c4f0c1f6edff49dcc89670930be978ff867
Merge "Some cleanup in ReferencedUrlFinder related code"