Merge "Fix typo in class2greylist" am: 921702dfd9
am: e0ef320553

Change-Id: Ia3ffc74cdd95ee5784f483dd7195ccccb11ae423