Merge "Fix problem with atest class2greylisttest"