Merge "Fix tests broken by D8's handling of class retention annotations"