Security Vulnerability - CVE-2012-6702 and CVE-2016-5300 am: caf0317e4c
am: c398617e02

Change-Id: I36201a8c2d97ed8015c101f98b088a6f2e2f3fda