Cherry-pick a change from tizen branch