CVE 2016-2109 fix am: 56abb3ed72 am: e0becbcb23 am: 5cfdab8c9d
am: 61c19b30c3  -s ours

Change-Id: Id63226d899e632c9c5959c1a46178a3a51978e4e