Merge "Remove emulator specific files from non-emulators" into main