Merge "Blacklist truncated atoms instead of whitelistnig" into qt-dev am: 85a3a4689c
am: 9c4a7fb13e

Change-Id: Ib442beaa97f07cf366e52d05b05b07f1efcd0381