CVE 2016-2109 fix am: 56abb3ed72 am: e0becbcb23
am: 5cfdab8c9d

Change-Id: I47f04e066540eac02b0a833b8f655a940a43bb36