Merge "DO NOT MERGE Add tests for security vulnerability CVE-2016-0718 am: a7b65854 -s ours am: 557faae2 -s ours" into marshmallow-cts-dev am: 3f09914e -s ours Change-Id: If4e37b19805ccc27010c8581357e732c3fdaf603