Merge "Update annotation name in class2greylist."
am: 6c32f5d18e

Change-Id: I1a1f79a7a95814e37d337f1bb6bd10aa545cfaf9