Merge "Fixes in RouterServiceUtil"