sync with tizen branch 30/131030/1
authorSejun Park <sejun79.park@samsung.com>
Thu, 25 May 2017 06:20:11 +0000 (15:20 +0900)
committerSejun Park <sejun79.park@samsung.com>
Thu, 25 May 2017 06:23:19 +0000 (15:23 +0900)
Change-Id: I956dd5d205bd813c8c641a7bac50baad5ded7580


Trivial merge