Fix SmokeTest

Change-Id: Ia53766b62d3777de49eaaac122042b99e6f1a3f7

Conflicts:

	envsetup.sh