Merge "Support whitelist entries from class2greylist"
am: ac0ddfd9c5

Change-Id: I8ee8bb93f39995665d98fc38859d51e08213766c