Merge "Fix tests broken by D8's handling of class retention annotations"
am: 528d3ad2a4

Change-Id: Ib33f7b48680cca2c6453f3d9bdb7d15508505d77