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

Change-Id: I9349026a5f99cb2ebac1d9fadd3c716e8a06aaa3