Merge "Skip logging error when service name doesn't match vintf format" into main