Merge "Restore some greylist entries." into qt-dev am: 4c46902338
am: fb602c910c

Change-Id: Idf21ebd1432e712f661d7b2fc4e203bc5f757910