Merge "Restore some greylist entries." into qt-dev am: f76bdce6e0 am: 13ffa87a6d
am: 89f02cc81c

Change-Id: Ib5bc4e76d81ad69f7c3293e6cb72393e1aee7ed9