Merge "emulator: reset revision to 1"