Merge "[SDC] Fix MSB annotation for sdc-be service port"