Pick up lost changes from submit/tizen/20130710.103011

No match.