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

Change-Id: Ib27dbd2764bf898a221f3b0ce09fd6b72bd91375