Merge "[SDC] change comment style"