Merge from Perforce
Fix the script issue in the soft GRE test suite
Fix the script issues in the AAA test suite