Merge changes I279bb901,If101a133 into tizen_2.1