[npjohnson]: adapt to reflect 18.1 upstream merges as well as include now required headers. Change-Id: I8581d22deac451d0c44e4b3135d2729da2865a36
* CAF tag LA.UM.9.1.r1-11600.03-SMxxx0.QSSI12.0 Change-Id: I48b8326aab719b236ff6b39c05dc4df1eeb6f688