Merge "Emulator cleanup in ClipboardService.java"