Merge "Replace 5.4 kernel with 4.14" am: ec6ad8f106 am: 6441c36c11

Change-Id: I232867b3ef24f2e8492a436ecac48ee469f9abbb