Security Vulnerability - CVE-2012-6702 and CVE-2016-5300 am: 3c2f09e63a am: 3188d5f5bd am: ae32ff2022 am: f6f28331b0
am: 15477bfab1

Change-Id: Ibba503e81bcae53bf37709ca2e214159360cf3bb