Merge "Fixes required after https://review.tizen.org/gerrit/#/c/189231/" into devel...