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