Merge "Merge "Blacklist truncated atoms instead of whitelistnig" into qt-dev am: 85a3a4689c am: e4677ac1d2" into qt-r1-dev-plus-aosp