Merge "Merge branch '1.3-rel' (acdf0b6)"
authorAshok Babu Channa <ashok.channa@samsung.com>
Wed, 3 Jan 2018 13:26:28 +0000 (13:26 +0000)
committerAshok Babu Channa <ashok.channa@samsung.com>
Wed, 3 Jan 2018 13:26:28 +0000 (13:26 +0000)

Trivial merge