am 50152821: am a1425660: Merge "Make sure whitelist targets are in the main...
am 50152821: am a1425660: Merge "Make sure whitelist targets are in the main dictionary" into jb-dev
* commit '50152821':
Make sure whitelist targets are in the main dictionary