Merge "Move ownership to emulator team." into emu-master-dev