am 311e3662: Merge "Merging emulator smoke test projects" into master-nova

* commit '311e3662bdaec82c621fd3b04c4505ce60d2df15':
  Merging emulator smoke test projects