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

Change-Id: Iff29bca8243e0c5e0e7ec30cd8b4a3f95c43ac82