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

Change-Id: Ia255e1bff341d42ca7664761730e2ec8e45fd8ea