Merge "Update annotations to spec for message-router"