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

Change-Id: I4c92e5685804a5b03510ab5b9396c0dc6f4aad46