Merge "Remove deleted fields/functions from greylist." am: 037a0879c0
am: bcaf794579

Change-Id: I19a98cfa1f3226380c7ecdacb57f45bb976fb532