Merge "Do not concat exception class name in Timestamp compat"