Merge "Merge "Restore some greylist entries." into qt-dev am: 4c469023 am: fb602c91" into qt-r1-dev-plus-aosp