Merge from Perforce
Fix the script issue in the AAA test suite