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

Change-Id: I0fd8a3ee7d3b1deca76c989328a76c06274b736b