Merge "Add workaround to handle the testtool skip exception issue"