Merge "When logging route id, also log package name" into udc-dev