felica/cm3602 conflict-fix test 4(fix mismerge)