Merge "Fix problem with atest class2greylisttest"
am: 6e40731bcb

Change-Id: I8876b1771362461a4bd85ec5424280277741dc77