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

* commit '8ba31cffba41563739029be4643f547ad6e5d0aa':
  Add test for CVE-2014-3153