Merge pull request #3 from tdz/bug-916863

Bug 916863 - [NFC] NFC support in emulator