Merge "Change validate message for test_exceed_max_template_size_fails"