Cherry-pick a change from tizen branch

No match.