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

Change-Id: I272fd31383d03ba18fedebae06078592a698acc0