Merge "Merge branch '1.3-rel' (c2772094)"
authorZiran Sun <ziran.sun@samsung.com>
Fri, 19 Jan 2018 13:13:11 +0000 (13:13 +0000)
committerZiran Sun <ziran.sun@samsung.com>
Fri, 19 Jan 2018 13:13:11 +0000 (13:13 +0000)

Trivial merge