Merge "Ensure serialVersionUID computation for Throwable subclass is stable"