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

Change-Id: I40f23e27dc28c9829079beb6550084505d38dddc