Add support for deprecated annotations.

RB=229233
R=mtagle,ksobolev,kparikh,si-dev,yborovik,kjin,gogenc
A=gogenc,kparikh
fix d2-int-test

RB=233011
R=si-dev,osumampo,cpettitt,dhoa,zzhu,sihde
A=dhoa
Revert "fix d2-int-test"

This reverts commit 9b381455a941177d8ba7ef26574d125b1f3701c5.
Recommit the patch of fixing d2-int-test
Fix for compilation problems.

RB=233491
R=gogenc,jbetz,kparikh,si-dev,kjin
A=gogenc