Update x86 and x86_64 kernel images [DO NOT MERGE] automerge: baaba1db6d  -s ours automerge: 1e01450b8b  -s ours automerge: 25a197bba5  -s ours automerge: 805d4ae347  -s ours automerge: 162077fe89  -s ours
automerge: c4fbb41046  -s ours

* commit 'c4fbb41046e14cb462ab66e29cc5faf7b119e914':
  Update x86 and x86_64 kernel images [DO NOT MERGE]