Merge "Release 5.0.4" into tizen accepted/tizen/unified/20180830.182653 submit/tizen/20180829.134902
authorKarol Lewandowski <k.lewandowsk@samsung.com>
Wed, 29 Aug 2018 13:39:10 +0000 (13:39 +0000)
committerGerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
Wed, 29 Aug 2018 13:39:10 +0000 (13:39 +0000)

Trivial merge