Merge "Modify RadioButton test case" into devel/master