Merge "Merge branch '1.3-rel' (3040a9e)"
authorAshok Babu Channa <ashok.channa@samsung.com>
Fri, 20 Oct 2017 21:24:04 +0000 (21:24 +0000)
committerAshok Babu Channa <ashok.channa@samsung.com>
Fri, 20 Oct 2017 21:24:04 +0000 (21:24 +0000)

Trivial merge