Merge from Perforce
Modify the attribute of source codes
Merge from kddi branch
Modify the source from kddi branch so that the test cases can run properly in cambridge branch
Merge from Perforce
Merge branch 'imp/config_ap_zone'