Merge "DO NOT MERGE Initial hostside commit for CVE-2016-8430 " into mnc-dev
am: 4d421d457d

Change-Id: I3e058a4909ce73ea64078ec44bbace8b9f65a837