Merge "Changes needed for https://review.tizen.org/gerrit/#/c/191202/" into devel...