DO NOT MERGE Add tests for security vulnerability CVE-2016-0718 am: a7b65854 -s ours am: 557faae2 -s ours am: cd0b8d74 -s ours Change-Id: Ie5e4d388231b985b5d479811de75e5ef5c274cd6