Code sync

Signed-off-by: yoonki.park <yoonki.park@samsung.com>