Merge "Replace 5.4 kernel with 4.14" am: ec6ad8f106

Change-Id: I388a0bffa88a68a11442c3fc81fabd9cb7b647c8