Tweak test size annotations.
am: 38212ae82e

Change-Id: I4d2590d554151fb4d5543df5e3d259051d2099f2