Fixes to make 4.14.98 compile

Change-Id: I06409926a74b69c1bc25b19574370e91e01dc1c2
2 files changed