Merge changes Ibff4b686,I201a8c75 into tizen

No match.