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

Change-Id: I92f7f5bddc6472f85780457ab6c4d1a3cb3b392c