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

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