Merge "Upgrade emulator kernels" into nyc-dev