CVE 2016-2109 fix am: ea156ae109 am: e1ea8662fe
am: af3380318b

Change-Id: I9bbcfa8dd7abe7aa4b6669bbd406274134bbc9ad