Merge "Support whitelist entries from class2greylist" am: ac0ddfd9c5
am: 28446c917f

Change-Id: Ie88f36693b5ed6ee3931b45222d9fcf5bc5dd798