Fix emulator bustage on 1.3t branch a=red