Merge "Add service endpoint annotation for SDN-C"