Merge "Add service endpoint annotation for message router"