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

Change-Id: I3dd8e06f051d74c0e769a492cd96dbd5aa73d880