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

Change-Id: Ieba6b6396f1ab51ba5c47178d5110e35836b66f0