Merge "Merging emulator smoke test projects" into master-nova