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

Change-Id: Iecc746cb8ec5144fc613af2a761c78c604486e3c