Merge "Emulator 28.1.9 requirement"