Merge "Some more members for the light greylist." into pi-dev
am: 2dacab9844

Change-Id: Ia708cea9a0c847c5b8b0a17ebc504a4acdcc1ed8