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

Change-Id: Iecfde8e175dbf26c2166c1cd5361ff20ac51f8f9