Merge "Detect ranchu as emulator" into nyc-dev