Merge "Update 4.14 x64 kernel to 5954988" am: f9cd23ff45
am: 81f2f11e75

Change-Id: Ic9e7038507f711b50c8845c893938f324969c56c