Merge from Perforce
Fix the test case of checking system capability
Add the test case of disabling overwritting the AP configuration