Merge branch 'upstream' into sandbox/yohoho/check_upgrade
authorYeongjong Lee <yj34.lee@samsung.com>
Thu, 27 Feb 2020 06:17:12 +0000 (15:17 +0900)
committerYeongjong Lee <yj34.lee@samsung.com>
Thu, 27 Feb 2020 06:17:12 +0000 (15:17 +0900)

Trivial merge