Merge "Merge "Restore some greylist entries." into qt-dev am: 4c469023 am: fb602c91" into qt-r1-dev-plus-aosp am: 42b41c51 Change-Id: I49fac41af5b785ff18c42e584985501a5d2f160b