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

Change-Id: I5256637db768aa71d0977c7b4df734f0064a4c3b