Merge changes If8d86c6b,I645aca31

* changes:
  Upgrade emulator kernels
  Upgrade emulator kernels