am cc007aaf: am 3bbb6494: am 772e12cf: Cumulative security CVE-2014-3686 patch

* commit 'cc007aaf638d0aa5100d3495d14e0bbc6cb14842':
  Cumulative security CVE-2014-3686 patch