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

Change-Id: Iff5a0706baf94b42ebc5b9f85cfb554f32c04692