Merge "Fixes for https://review.tizen.org/gerrit/#/c/190831/" into devel/master