Merge branch 'tizen_4.0' into tizen 04/153904/1
authorDmitry Kovalenko <d.kovalenko@samsung.com>
Tue, 3 Oct 2017 07:10:59 +0000 (10:10 +0300)
committerDmitry Kovalenko <d.kovalenko@samsung.com>
Tue, 3 Oct 2017 07:11:09 +0000 (10:11 +0300)
Change-Id: I5b1609cf88d624624de6791dfca14fd7a53f4664


Trivial merge