Merge "Remove EC2 test case that incompatible with Amazon"