Merge branch 'master' into EDGE-299
authorjaehoon.hyun <jaehoon.hyun@samsung.com>
Fri, 29 Mar 2019 09:13:28 +0000 (18:13 +0900)
committerjaehoon.hyun <jaehoon.hyun@samsung.com>
Fri, 29 Mar 2019 09:13:28 +0000 (18:13 +0900)

Trivial merge