Merge "Simplify the error message for ABI check"