[npjohnson]: adapt to reflect 18.1 upstream merges as well as include now required headers. Change-Id: I8581d22deac451d0c44e4b3135d2729da2865a36
[npjohnson]: adapt to reflect 18.1 upstream merges as well as include now required headers. Change-Id: I8581d22deac451d0c44e4b3135d2729da2865a36