am 912d1506: am 8ba31cff: am 95c75537: Merge "Add test for CVE-2014-3153" into jb-dev

* commit '912d15067f598cff726c69fbbb24695dbed55034':
  Add test for CVE-2014-3153