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

Change-Id: I11f707305d32805d76d8fe2517e681a9e9f67e54