Merge from tizen_2.1_smack.