Merge "Restore some greylist entries." into qt-dev am: f4535c8d51 am: cd82f9adff
am: 7a4d871174

Change-Id: If3c3de3ec24226ec6ea10603ca246487ac40bfb4