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

* commit '4fff398d69a0f0df8f0aac35f863b228a0faec26':
  Add test for CVE-2014-3153