Merge "Ensure serialVersionUID computation for Throwable subclass is stable" am: 421d147f75
am: 1370b735d8

Change-Id: I6d1b5635d6025911098bb89a0c12850404edeb19