Merge changes I01823716,Ic90be0b8

* changes:
  Upgrade emulator kernels 3.18
  Upgrade emulator kernels 3.10