Merge changes I55a21c1c,I21313f68,I4cd1f65e into tizen