Merge "Make CVE-2015-1805 test more robust" into nyc-dev
am: b737f5e

* commit 'b737f5e327aa9315a8b576bb363b5ead3d0ca19d':
  Make CVE-2015-1805 test more robust

Change-Id: I8c77a6de816083dd253d364ef350472468098289