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

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