Merge commit '346b1212862b0f339185c8fcc1f98d833e9f287e' into tizen_2.2