Merge "Update skip message in overlimit testcases"